Refactored Constants to more appropriate package
Removed unsed stuff
Removed @Component